From 0923f06c306341b8def952a51743e0882a32d9f3 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sat, 17 Jan 2009 14:35:56 +0000 Subject: [PATCH] Make babl.h look clean. * babl/babl-introspect.h: New installed header for babl_name() and babl_introspect(). * babl/babl.h: Include it. * babl/Makefile.am: Add it. svn path=/trunk/; revision=376 --- ChangeLog | 11 +++++++++++ babl/Makefile.am | 2 ++ babl/babl-introspect.h | 40 ++++++++++++++++++++++++++++++++++++++++ babl/babl.h | 14 +------------- 4 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 babl/babl-introspect.h diff --git a/ChangeLog b/ChangeLog index 4d39759..4bdd754 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2009-01-17 Martin Nordholts + + Make babl.h look clean. + + * babl/babl-introspect.h: New installed header for babl_name() and + babl_introspect(). + + * babl/babl.h: Include it. + + * babl/Makefile.am: Add it. + 2009-01-17 Martin Nordholts * babl/babl-internal.h: Formating. diff --git a/babl/Makefile.am b/babl/Makefile.am index b5b64f0..40479df 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -38,6 +38,7 @@ h_sources = \ babl-db.h \ babl-ids.h \ babl-internal.h \ + babl-introspect.h \ babl-macros.h \ babl-main.h \ babl-memory.h \ @@ -57,6 +58,7 @@ library_include_HEADERS = \ babl-fish.h \ babl-format.h \ babl-image.h \ + babl-introspect.h \ babl-macros.h \ babl-main.h \ babl-model.h \ diff --git a/babl/babl-introspect.h b/babl/babl-introspect.h new file mode 100644 index 0000000..6b6d95d --- /dev/null +++ b/babl/babl-introspect.h @@ -0,0 +1,40 @@ +/* babl - dynamically extendable universal pixel conversion library. + * Copyright (C) 2005-2008, Øyvind Kolås and others. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * . + */ + +#ifndef _BABL_INTROSPECT_H +#define _BABL_INTROSPECT_H + +#ifndef _BABL_H +#error this file is only to be included by babl.h +#endif + + +/** + * babl_name: + * + * Return a string decsribing a BablInstance, might work better than + * babl->instance.name when a good human readable name is desired. + * + * Returns: a name describing the instance. + */ +const char * babl_name (const Babl *babl); + +void babl_introspect (Babl *babl); /* introspect a given BablObject */ + + +#endif diff --git a/babl/babl.h b/babl/babl.h index f67a856..7c54d60 100644 --- a/babl/babl.h +++ b/babl/babl.h @@ -35,19 +35,7 @@ typedef struct _BablList BablList; #include "babl-macros.h" #include "babl-main.h" #include "babl-class.h" - -/** - * babl_name: - * - * Return a string decsribing a BablInstance, might work better than - * babl->instance.name when a good human readable name is desired. - * - * Returns: a name describing the instance. - */ -const char * babl_name (const Babl *babl); - -void babl_introspect (Babl *babl); /* introspect a given BablObject */ - +#include "babl-introspect.h" #include "babl-version.h" #include "babl-type.h" #include "babl-sampling.h" -- 2.30.2